label: minimum/natural size parameters are not nullable
authorTimm Bäder <mail@baedert.org>
Tue, 3 May 2016 20:07:50 +0000 (16:07 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Tue, 3 May 2016 20:25:57 +0000 (16:25 -0400)
Stop comparing them to NULL.

gtk/gtklabel.c

index 1089242db5aa379d16e7081e4a2d2cf9ee7b12b7..5607c91495c04030ea7ebf2b1fc78074fd55b72f 100644 (file)
@@ -3641,11 +3641,8 @@ get_size_for_allocation (GtkLabel *label,
 
   pango_layout_get_pixel_size (layout, NULL, &text_height);
 
-  if (minimum_size)
-    *minimum_size = text_height;
-
-  if (natural_size)
-    *natural_size = text_height;
+  *minimum_size = text_height;
+  *natural_size = text_height;
 
   if (minimum_baseline || natural_baseline)
     {